# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1238+1.1153.67.27 -> 1.1239 
#	arch/ia64/hp/common/sba_iommu.c	1.28.1.1 -> 1.30   
#	arch/ia64/sn/io/drivers/ioconfig_bus.c	1.3.1.1 -> 1.5    
#	arch/ia64/kernel/perfmon.c	1.58    -> 1.59   
#	   arch/ia64/Kconfig	1.38.2.2 -> 1.38.1.4
#
diff -Nru a/arch/ia64/Kconfig b/arch/ia64/Kconfig
--- a/arch/ia64/Kconfig	Tue Sep  9 01:05:19 2003
+++ b/arch/ia64/Kconfig	Tue Sep  9 01:05:19 2003
@@ -267,7 +267,7 @@
 	  unsure, answer Y.
 
 config PM
-	bool
+	bool "Power Management support"
 	depends on IA64_GENERIC || IA64_DIG || IA64_HP_ZX1
 	default y
 	---help---
@@ -569,6 +569,7 @@
 
 source "arch/ia64/hp/sim/Kconfig"
 
+source "arch/ia64/oprofile/Kconfig"
 
 menu "Kernel hacking"
 
diff -Nru a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/hp/common/sba_iommu.c	Tue Sep  9 01:05:19 2003
+++ b/arch/ia64/hp/common/sba_iommu.c	Tue Sep  9 01:05:19 2003
@@ -1930,10 +1930,10 @@
 }
 
 static struct acpi_driver acpi_sba_ioc_driver = {
-	name:		"IOC IOMMU Driver",
-	ids:		"HWP0001,HWP0004",
-	ops: {
-		add:	acpi_sba_ioc_add,
+	.name		= "IOC IOMMU Driver",
+	.ids		= "HWP0001,HWP0004",
+	.ops		= {
+		.add	= acpi_sba_ioc_add,
 	},
 };
 
diff -Nru a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
--- a/arch/ia64/kernel/perfmon.c	Tue Sep  9 01:05:19 2003
+++ b/arch/ia64/kernel/perfmon.c	Tue Sep  9 01:05:19 2003
@@ -2113,7 +2113,7 @@
 	return 1;
 }
 static struct dentry_operations pfmfs_dentry_operations = {
-	d_delete:	pfmfs_delete_dentry,
+	.d_delete	= pfmfs_delete_dentry,
 };
 
 
diff -Nru a/arch/ia64/sn/io/drivers/ioconfig_bus.c b/arch/ia64/sn/io/drivers/ioconfig_bus.c
--- a/arch/ia64/sn/io/drivers/ioconfig_bus.c	Tue Sep  9 01:05:19 2003
+++ b/arch/ia64/sn/io/drivers/ioconfig_bus.c	Tue Sep  9 01:05:19 2003
@@ -346,9 +346,9 @@
 }
 
 struct file_operations ioconfig_bus_fops = {
-	ioctl:ioconfig_bus_ioctl,
-	open:ioconfig_bus_open,		/* open */
-	release:ioconfig_bus_close	/* release */
+	.ioctl = ioconfig_bus_ioctl,
+	.open = ioconfig_bus_open,		/* open */
+	.release = ioconfig_bus_close	/* release */
 };